projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dd7cd14
)
Fix build issue with smerge-mode
author
Lars Ingebrigtsen
<larsi@gnus.org>
Mon, 18 Oct 2021 07:13:51 +0000
(09:13 +0200)
committer
Lars Ingebrigtsen
<larsi@gnus.org>
Mon, 18 Oct 2021 07:13:51 +0000
(09:13 +0200)
* lisp/vc/smerge-mode.el (easy-mmode): Require.
lisp/vc/smerge-mode.el
patch
|
blob
|
history
diff --git
a/lisp/vc/smerge-mode.el
b/lisp/vc/smerge-mode.el
index 5a0b90863ae2675296ff2ca2072df1e8fa4a428d..0be1a03c650a1c19b0bff9ef1b3544efa749b89a 100644
(file)
--- a/
lisp/vc/smerge-mode.el
+++ b/
lisp/vc/smerge-mode.el
@@
-47,6
+47,7
@@
(require 'diff) ;For diff-check-labels.
(require 'diff-mode) ;For diff-refine.
(require 'newcomment)
+(require 'easy-mmode)
;;; The real definition comes later.
(defvar smerge-mode)